This takes a number of changes from the last couple of years that we've done on our net/http middleware.

This will then allow us to take on contributions more easily, as well as look at cross-middleware options.